Code inspection

Just played with a code inspection program. 

Feel free to merge this fixes.