Updates to reflect repo style guidleines.