minor cleanup

removing unused/redundant code, cleaned some comments, slight reformating in class to remove kwargs