Added good style for header, and some convention changes