Stylistic fixes

General fixes related to "prettifying" some previously raw and unfinished code.