Cleanup / refactor