fixed codeassist, some cleanup