Happy with it
Slight cleanup