updated a few conventions, all files should be consistent