add quote & code refactoring