removal of _init calls for pickle & code formatting
fix sample commands