Methods' return types, variable names and indentations  are improved.