finalized variables, organized imports, changed to methods (do not
return null)