clean up & fix