Removed redundant self references, cleaned up matching, removed trailing spaces.