Code clean up and other such small changes