Simplifying language, cleaning up logic