Cleanup

commits are pretty explanatory