removed height, width, and rotate variables, improved formatting