Fix field naming conventions
comment some methods