Fixed annoying comments