move stuff I didn't write to obvious places
satisfy jslint