Finalize before refactor angular app