Updated styleguide to better match our customs