Refactors for prettier code