closed #62, fixed imports and jalopy formatting