Categories code cleaned and enhanced, fixes #23