- Cleaning up code. Attempting to get it all namespace-resolved for easier editing.