Refactored a few methods