Visual Update
Clean up Code