Removed unnecessary imports and other code style improvements based on Eclipse warnings.