More lecture code + formatting + comments