Improvements indentation boilerplate