some more code styling fixes
removed some getters and made the variables public