Source format + minor names refactoring