Added better initial commenting