working on cleaning views