Fixed intentation and formatting issues that were caused by the previous commit