Simplify and shorten methods to increase code quality