Made lot of things simpler in the code.