tune-ups to code. Cleaning up directory