Tidying & finalising code

Removing unnecessary code & fixing indentation