Some refactoring/cleanup