Move comments in the declarations to specification