Add javadoc, cleanup, rename commands

Change-Id: I582130ba719489c56f7813242bdb2ede4e486232