Remove some comments, inline some cases