Remove unneeded cruft
Add initializers