Simplifications
Further cleanup
Fix layout