Add comments and optimizing gocode