improve and clean up things