tweaks + #include Cleanup