code and file cleanup