Removing stupid code
Improved UX