Fixing spacing
Removing useless functions