[Improved Methods] Decrease coupling between methods