Style changes, corrected header and cpp files