Melanie's style branch

Fixed the merge conflict.