Renamed non-setters/getters, fixed code style, too long lines