cleaned up file names, commented JS