Refactor

icongs?