Code cleanup; indentation + braces