Minor formatting and working changes