Code commenting and some displaying improvement