FIX: Some code formatting