first commit clean up, more to come