Cleanup, fixing problem with all negative points