Cleaned up some irregularities in code format