Updated methods / variables

Updated the methods to look more all the same and indented the variables.