Enhances indentation, there are still some variable/function names to refactorize