Cleaned up spectre a little