Replaced blank spaces using unless with ternary operator. Killed some more minor bugs.