some cleanup of unneccesary noise in the code