Change naming conventions. Started inline documentation