Code formatting, removing of unused imports