Refactoring

Updating the Get Set methods to make them neater and cleaner.