Refactored a few redundant methods