There is actually no need for such indentations.
A few methods were renamed accordingly for consistency