Switching to IntelliJ IDEA for now. Several fixes for warnings.
Organize imports