cleaning up getters and setters to be more oritented with spring