Code cleanup
lint free