clean up, comment, reorganize, that sort of stuff