General reviews and refactors