Cleaned commented code and imports