Refactored some names for better redability