Fixed header and code style