Final best practice edits

Some final rearranging based on testing in windows.