Code cleanup
saving changes