cleaned up Interface and Main a little