Fix a small bug with the aspect ratio (for clipping) and rename a
variable