Organizing stuff. minor improvementes in naming conventions and comments