Made conventions more uniform between files