Build tidying