fix small isses with coding standards and typos, remove strlen from for loop

There was also one file commited by mistake (.orig) - removed.