Cleaning up from first commit