Fixed some indentation and other issues