Remove extra quotes and refactoring