Fix Code.
Clean up Code.
Better logic.