Some refactoring/cleanup to standardize things a bit better.