Cleaned up main include