app fix, psr-2 refactor