Code

Some additional Paint Bucket optimizations and cleanup