clean up

Cleaning up code i.e. deleting unnecessary code and fixing tab issues