code clean up & muted