Code clean up of the scholar module and naming conventions.