Refactor

 1. Remove unused imports
 2. Update code formatting
 3. Add TODO comments