Added types to assignments/list
Removed unused bits.