small cleanup: code & files