Update to better fit in with Mantis coding guidelines