Refactored main, pulled some drawing methods into a separate class