Changed to clearer representations, minor cleanups