Code Clean up by Ruchika