Comments for base classes + more clear methods and parameters names