clean up and removed redundant list comp