Cleanup warnings
Code formatting & cleanup.