Fixing tabbing
Breaking up circular dependency