Improved code readability / indentation