Minor fixes.

- Removed unnecessary keywords.
- Inlined some functions.
- Minor coding style fixes.
- Minor fixes.