Fixed the last few functions to sync with the coding style the rest of the file use