Everything is ugly!
 - Simplified and re-indented code