cleanup
cleanup, seperate snippet more