Finalized View and Cleaned Code