Working on comments and design