Just a heavy round of code inspection