Code Cleanup

More comments and small code changes