Removed some clutter from main