Feature better code reviews

DO NOT REVIEW