cleanup and replace should with can