Cleanup

Fixed indenting and variable names