Simplify the code. Comment some more.