Made a few fixes, style changes for consistency