Fixed comments and code clean up