Add defined type section and clean up post-lab section