Removed unused import
Small code fixes and code style changes.