Finish Style
Fixes commit merge problem