cleanup
fixing feature