cleanup Application plugin
general cleanup
cleanup based on Code Sniffer (phase 1)