Cleanup and consistency-ify