fixed version
refactored/fastened quote & simplify
improved simplify, typos