Refactor / cleanup