Small style changes and read ajudstments