Code clean up and small changes