got rid of redundancies to clean up