removed unecessary clutter from main