Making app cleaner