cleaning up more functions -> properties & docs