cleanup
improve style