Refactors for better context