got rid of redundant code and comments