Style changes and proposed improvements