Created default no category and cleaned code.

acfortier