Changed comments and made Main non-public