Let's not shorten the code right now. Small fixes.