Added Final comments and clean up

by Abhinav Tripathi