Minor Refactoring.
* cleaned up
* removed warning