Removed self/selfM. Whitespace cleanup.