std cleanup

Commits are self-explanatory.