Minor cleanup.  Also there seems to be a bug in having mutipule categories
Signed-off-by: Paul Beeler <sparksco@gmail.com>