Finalized comments and code