Code style, whitespace and improve consistency.