Fixed some issues with indentation