Removed nslog statements.
Code formatting.
Code format.
minor code cleanup