Removed redundancy, and debugging aids