Some little changes
cleanup