Fixing codestyle, simplify completition.js