Fixing compile errors and spacing inconsistencies