Lots of cleanup & encAZApsulRAPHation