updated idioms with my style of coding