cleanup directories
formatting fix
compiler warning fixes