Mostly stylistic changes, set a few things up for the future though.