Style improvements based off of review