Code style a bit better now.