Cleanup; adhering to Fuel's coding standards a bit better