Finalized and Cleaned :)