Better comments and inlining