cleaned up the first commit