Code cleanup. Coder devel.