Remove junk
Refactor comp function
Fix indent
Rollback temporary change