Moving stuff to properties, cleanups