clean app file
make code cleaner
small code improvements