Quick refactor #157