cleaning up from first commit