Feature/cleanup

Cleanup from @lmacken.