Amended naming of key, commenting and logging