Add some more meaningfull comments