misc changes to help readability and make pass stylecop!