Code cleaning up
Code cleaning up