slight cleanup
New skeletal