Clean up
Code clean up