Some minor cleanups.  Also there seems to be a bug with having multipule categories
Signed-off-by: Paul Beeler <sparksco@gmail.com>