some cleanup and little changes