Refactor names a bit
Remove unnecessary accessors