Slight refactoring/cleanup
Cleanup