Updated some files.

Updated some files so the code is more consistent.