Finishes comments and code layout corrections