Marker call added, organized imports, formated/cleaned up code