Emojis + cleanup
Cleanup + formatting
Merge branch 'cleanup'

* cleanup:
  Cleanup + formatting
  Emojis + cleanup