Simplifications and clean up