It works?
Slight cleanup