ErnoMucha Add comments and code cleanup.