Updating header and implementation per coding style