Cleaning up things and commenting