refactoring code and building mobile