Keeping things DRY and added additional sections