Not sure why becoming way more simple and readable is a bad thing.