cleaned up main.vala