[ticket/314] Fix function and method comments