Remove unused demo code.
Better requirement matching.
Move constants inside main class.