Some refactoring, finished approves