Created additional class and cleansed the code.