code cleanup, start to rename the app