Cleanup and encapsulation. Working state.