- Minor cleaning up/refactoring/tagging