Cheanup

Code clean up