Various cleanup and simplification