Cleaned my 'self' up