Remove commented code blocks
Rename the "magic" spaghetti to something more describing