Formatting fixed

Formatting fixed + unneccesary code removed