Shaved a few more lines.