Fix the mess over here , now pushing will be easier .

guys , please merge this , since pushing will be easier and it tides up things .