Refactor imports and improve readability

  * Simplify import statements
  * Add line breaks for better readability
  * Align conditional imports
  * Remove redundant comments