Improved version ...a bit

fixed if loops in CurrentCategory() with more elegant solution using
extension.
Added pause on console input.