Create table + simplifications and clean-up