Comments and rearranging of sample environment