removed floor from CGRect helpers
simplified logic