Second Refactor

nil