Improvements to main

Removed using namnespace std for obvious reasons