General refactor/cleanup