First batch of suggested improvements

See: https://groups.google.com/d/msg/chicagoboss/JF_1Xn629uA/cJ8gi2qlfZ8J