Code cleanup
Spec cleanup