Some styling fixes. Cleaner code.