Refactored. Before cleanup
nil
nil