code optimization, heavy revamp of app