refactor app name and code syling optimised imports