Cleaned up for CI