Fixed formatting, removed all explicitly added imports, replaced with package.*;