clean up & tiny optimize