FIX: Formatting and whitespace issues