split app to seperate files
remove unused variable