Updated content
Code tidy