Cleanup

Implementing Joseph's feedback