Made new style adjustments based on the boilerplate start