Refactoring
Places parser