Tried to clean up