Changed a lot of indentation