Removed the convenience variables.
Split dj() into dj() and master().  Code cleanup.