cleaning up the code
merged