Style Changes #50 #55 #57