#137

fixing a code
removed unnecessary getters/setters from internal class