Replaced int location attributes with Rectangle attributes

It was redundant because Rectangles have X and Y attributes already