rename, change author, remove non-static functionality