cleanup
correcting naming