Remove unused files, make some filds private
Improve inline documentation
Improve inline documentation