Code clean up in order to help make sure that all files follow the same coding convention