Refactored setters
Alignment