Small refactoring without CamelCase. Fix doc blocks. Fix small mistakes. etc..