clean up & tiny fix