reorder assignments to include more OOP