Fixed small overview.
Improved code consistency.