Renaming variables to be dash separated.
Fix some indentation. Probably need to do a larger indent fix