Code clean up changes