I will fix everything in a single commit once you are done reviewing