simpler code
fix spelling
macro are ok