Major Style Changes

Charlie's requests