Shorten getters and setters to one line
Comment and clean code