used bitmap clip width/height vars where possible to clean thins up a bit